Update layout setup
Setup layout core updates
Fix whitespace