Added icons, improved UI/UX