added mainnavi
some delete