implemented save button and ordering