merged in upstream tab changes and removed :after boxes