Changed target back to 5.1
Refactored the enable and disabling of buttons
Commented out all the saveBtn functionality