Added a bit more layout, hopefully