more fixes for UI and core func enabling