Fix resume style bugs. Add ga
Merge branch 'dev'