Commits before the break still adding buttons