Minor fix
Added tabbed and collapsible layouts