Fix bug with conditional styling through angular and cleaned up code
Merge pull request #19 from jeffreywix/Fix-StyleandCleaning

Fix bug with conditional styling through angular and cleaned up code