[FIX] Small api and ui fixes