Fixes for module, layout, and widget tickets (CONTENTBOX-247, CONTENTBOX-248, CONTENTBOX-249, CONTENTBOX-250)