Many UI improvements. Fixed issue - closes #