Move tab control into separate class