Also make use of fragment arguments and targets to simplify code. Change-Id: I79884854f4c7ff4fdc35c68087b5b2235a75c79f