Minor tweeks + Analyze Gym layout + buttons