Replace types with diamond types
Fix FAB not appearing when there are no stops