Side Panel edit.
small changes
small changes 2