more fixes for the UI change