Cleaning up crosshair class layout