restructuring stylesheets
more styling changes for filters
fixed conflict
initial styling of maps page
Merge branch 'master' of github.com:NewSpring/NSMaps