Fixing filtering and styling
Merge branch 'master' of https://github.com/rlargman/uncharted