merge
build script, minor UI changes