ui code changes
ui fixes