fixes for mac
UI improvements