New ship list display / individual display
fix merge conflicts
More merge error fixes