Refactor styling: split into several files
Minor style changes #1