Move css to separate file, re-org