UI tweaks. Enabled view tracking