Added cookie support
Simplified spinner selectors
Cleaned up some code