Merge pull request #37 from raziraz/master

Background color test
Merging conflicts
modal styling updates