Reworking UI: Added ImageIcons