Improving UI and drawables