Formatting & layout updates