TLC: Merged build tool into the main UI