some cleanup and minor ui-redesign