Updated design

Modified the design so that only one window container is used, only the
content changes.