Content window comp

restructure