improved some of the layouts, but have yet to add proper css styling