Added spinner and padding