Updated formatting & layout