Added spinner and tightened up access control