add about us + some refactoring