some fixes for the basic ui