Refactor. Update layouts.