Fixed visual issues
Fixed custom locations import (wasn't converting id to uppercase)