Cleaning. Need to set start position using data, fix loading issue, and save button