Fixed issues with loading portraint layout (v3)