MOB-30 Final fix on CSS
Merge pull request #5 from ojwanganto/MOB-30

https://jira.ampath.or.ke/browse/MOB-30
Merge remote-tracking branch 'upstream/master' into MOB-16
MOB-16 updated branch with upstream and refined the code