Improving UI and level 2