Minor method and wireframe updates