last minute ui fixes