Button colour changes. Highly controversial.
Bug fix of category mark calculation maybe?
Colour changes and bug fixes
Added TODO