Fix sidebar and add form