Second commit, layout finished.