Removed part that wasn't working

Removed the part of defining 2 tabs in 1 tag, since that was breaking
all other things. Also made some minor changes again.