Added some structure to layout