Lots of small changes manily to the layout