Updated layout with tabs