Fixed error box always appearing in Create Exercise page; tweaked buttons on Create Exercise page
Resolved merge conflicts