button edits and final changes