Cleaning up, refactoring, simple CSS fix...