Pull request with TIK changes

Various UI changes requested by DCC