Clean up and added tabs
STarted to design company tab