Change up the UI, fix bugs