Removed a line of code that caused the buttons to move further and further to the right on repaint.
Merge remote-tracking branch 'origin/dev' into dev