refactored home panel