started styling user, trip and marker edit pages
Merge branch 'master' into styling2
almost done with styling
Merge branch 'master' into styling2
finished styling trip/marker/user edit pages