Added in fixes and changes

Working in media queries;
fixed grid for icons;
clean up of code.