Bug fixing

Respect max size on docking, fix multiple Stages issue.