Added tabs

TODO: Lack improve appeareance