Cleanup
Fix some card bugs
Merge branch 'angular' into gh-pages
New build