Add Icons, card based UI, clearer which elements are clickable