updated HTML template layout, removed redundant tables and minor cleanup