Update UIMode : seperate heads and add per app layout option as well

Change-Id: I5c42b45826ceb2f3a799173fe1ea8a633e75dfa1