Cleaned up rendering and added display toggles