Improving UI Pt 2