lots more changes to UI and stuff