Tidy up markup and do image hover text