Cleaning Up, Hid unused buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	maintest.py