Changed the layout to better conform with best practices.