Tidied up html tables in templates