update application layout

Change-Id: I7032a0da189571f973d0416ce3495e37ab88f57c
End of Chapter 8

Change-Id: I8b5056875e4f65835e4d38a95fe191c00c741777