Added icons and modified  layout for delegates