nuture track changes and ui fixes