Nice layout
Merge branch 'master' into rails_3_2