Add spinner, Move defaults settings & methods