Refactor
Upgrade layout