UI corrections

This should fix #160 #340 #347