UI updated

HTML structure reorganised