Cleanup + CSS fixes