Small fixes, first fuji UI feedback.

Signed-off-by: haggi <git@haggi.de>