restructrure to support multiple screen