moved some deprecated logic
added window panel