refactored code and layouts