fix button rendering
Merge branch 'cleancontroller'