merging builder and ui

eeeek