Update build after design improments