UI Overhaul and bug fixes