Merge pull request #1 from Nazgard/tests

Tests
Merge pull request #2 from Nazgard/tests

css changes
Merge remote-tracking branch 'remotes/origin/master' into tests
cleanup