DRY up layout widget concerns
Remove old concerns