separated menu categories and cleaned up markup