Modified the layout a little