Refactoring (deeper!)
Adjust layout