spinner
spinner & map template reorg