Added analytics
Design improvements