Updated layouts in complete project.

Signed-off-by: Harman Sohanpal <harmansohanpal@gmail.com>