Cleaned up categoryView and categoryAdd