Buttons etc
Merge branch 'more_foundation'
Users controller changes