Minor changes to various layouts
Merge https://github.com/GoogleJump/Tardis
Minor changes to various layouts
Added changes to scschool view