Some more styling and refactoring of css