updated highlight css and cleanup