UI changes

Changes to fix ui issues in version 4.0