Sonar cleanup
ui changes