Category menu works
Cleaned up structure, with minor changes