Category addition and model refactor
bugfixes
formatting and display
formatting and display