Added improvements to layout.