Revised layout assignment from App component