View renamed and slight reorga of html elements