Few modifications to Wireframe Mode