UiAppearance changes and other few fixes