Adding icons and code cleanup