Lots of updates for theme settings page layout builder and configuration