Fixed layout bug with edition switching