Update tables / form and a couple quick fixes to keywords / images