Fixed some layout issues
Merge branch 'master' of https://github.com/ahc2483/angular-template