Adjusting button layout
Fixing typo
WIP Calibration stuff