added a GenericPane, modified views to use GenericPane