Rearranged the order of the layout
Nice test-box to verify that things works