fixed some stuff, going back to fix more UI stuff