[Priyanka/RC] Unified layouts, Fixing unwanted calls in edit page