Made buttons 2x2
Merge branch 'master' into ashwin