Fixing bugs mentioned by Babar Tariq
Merge branch 'theme-2' into phase-IV