Massive overhaul on UI