Small additions to layout (to make it look presentable for milestone 2)