Refactored Utils and Screens
Refactored Utils and Screens