Added better support for responsive edit mode.