Fixed UX a bit, changed icons