Final fixes for device edit pages