Few refactoring
Add support multiple screens