Small changes to use new dynamic layout and more flexible panel options in Moqui Framework