working on UI and icons