changed the ui to work better