ready to show

change some layouts
change organization hierarchy
some minor changes