Fixed up layouts. Emman's first commit.