Bug fix and UI overhaul