Add gridPoint locks to fix crasher. Update brandView and small fixes.