Added icons
Changed buttons
Added icons and colors