changed collapse location to after the tab-content
code cleanup
moving tab content instead of duplicating it