Altered the layout to be more versatile.