Prettier UI layout as well as fixing a button bug.