70% test coverage
More testing
fixed some margin issues
css merge conflict