Updates i tags to span tags; Improves behaviour of image and link items; Updates CSS