Certain UI theme change and bug fixes