Refactored cursor fixing to own method; Added fields for personal boat to main page