merge history works, bunch of ui cleanup.