clean up UI a bit
merge