Merge pull request #465 from sgomes/material-sprint

Adding column layout according to Material mockups: