formatting and ui fixes