Adding additional drawables and reworking ui.