Changed to dynamic towatch and minor UI changes