Added hooks for analytics
Added loading indicator