Wordpress fix and tidy up