Adding omniflex nesting, content layout fixes