Some more work on Fleet Overview screen