basic ui small improvements