More bugfixes and some changes to improve the UI such as moving buttons around