Some UI changes and older OS support