UI Fixes
Merge pull request #57 from apuyou/angularjs

A few UI fixes