Design merging updates

Big changes man