Tweaked the layout