Added new spinner and some code cleanup