UI and level3 fixes