refactor before including new home fragment