final touches and ui fixes