New buttons and replaced the is active state button
Merge branch 'master' of https://github.com/railsrumble/r13-team-113