Integrated the use of a separate Frame everywhere.