Fixing buttons #211