refactored home layout