Fixed broken UI (rolled back a redesign attempt, it'll be done later in a feature branch)