ui tweaks
Merge branch 'ui' of https://github.com/ClockworkNet/cwfm into ui