The final version - small changes to the layout