Overhauled UI, bug fixes