change loader to spinning logo

also remove some old macros