lots of ui fixes and added event tracking