Fixes for Edition Custom layout