Refactor and prettied up the layout a bit