Some updates for the latest version of moqui, fixed some layout issues