Improved menu functionality. Removed category filtering, but this will be
re-added later in a more efficient manner.