HTML fix and temp fix in inventory
Merge branch 'master' into driley