Fixes to user class and development of editing items