Refactored Home tab screens