Develop - Changes by Yogesh

1. Fixes for QA post handoff
2. CSS cleanup