changed icons to img tags, cleaned up names