Waypoint drawing window update

Reverted to standard window size of 30.