Modified the layout a bit