Added final layout