UI overhaul + bug fixing