Added a categories system and made whitespace consistent.