Save functionality now works but with incorrect positioning of controls