Updated final layout