Redesigned forms, rays now plots themselves