Made improvements to layout