Changed menu, workout sort order, and html