Small layout and theme cleanups for Moqui changes