Deleted some obsolete files / Changed form layout