Moved forms and controls from framework to main app