Work on expert mode UI