Improve build and new mode selection ui