Final changes in layout