reverted back to old spinner and fixed margins on metrics