Myriad of UX improvements and bug fixing