updated from master
updated css for mainview
updated with master
Merge pull request #16 from nguidry/designLayout

Design Layout Changes