Updated Icons
Mapped possible basic layout.