Numerous updates

* Toggling cardio versus strength
* Moving around fields
* Better sorting of fields
* Organizing buttons