complete restyle and restructure