Reset selected point fix
Side panel layout, and some other tidy up