cleaned up layout to use less classes in divs
Merge branch 'cv'