various changes to edit sidebar and form