Fix button clutter