Fixed issues with loading portraint layout
Fixed issues with loading portraint layout (v2)