Rearranged workout and profile pages
Fixed merge conflicts
Style changes to static pages