layout fixes
minor changes
Merge branch 'master' into rails4