Refactor CSS, fix more modal things