Nav, UI cleanup