Added a bit more layout, general structure