Tidy up app layout & add Analytics