Bug fixes
UI changes: