Added icons, fixed blocks display, and small changes