Big refactoring
Minor location FAB