WorkoutActivity.java starting to be finalized
DietActivity: General corrections