Continued blocking out editing UI