Remove concurrent_layout and clarify layout and themes selections (#272)