refactoring home and add address layout