Bug/minor ui fixes osx