Added different field options per workout type

Using different view layouts. Need modification but the idea works.
Added layers of exercise types
Merge remote-tracking branch 'origin/entry-activity-ph2-refine1'