Fixed a few issues on the wireframe