adding mvc components and fix up the css
Merge branch 'mvc'