Some minor but still powerfull changes to the layout