Bye Bye old Layout code