rearrange customizer content

BS3 commit 3160bd8
Remove commented out code and properly nest CSS again for .collapse

BS3 commit 371d14e