Fixed ui issues
Merge pull request #2357 from anilgooru/1.2+Responsive-Ui

Fixed ui issues