layouts & snippets small behavior fixes