Refactored: merged ShellForms and Canvas