Layout / Function fixes.