Finished up the layout and UI