fix more stuff and styling