Created more controls to clean up main form