Small changes to UI
Adding more analytics