finish redesgin

~~