Fixing nameing of buttons to name scheme
Finished cleanup on all spaces and replaced with underscores