Html fixes and updated settings and tracked items pages