Some small changes to the UI and the layout of main.