adding tabbed content + minor changes