Add spinner and cleanup CSS