Fixed item form
Tweaks per MD
Merge branch 'beta'