NXP-10401 move old layout to content view