Added icons and fixed some scrolling

still need smooth scrolling