Improve style and change spin display