code refactoring
quick design fixes #7

tabs design