Changed way to define current used layout. More simple way.