Updated formatting and layouts (no functionality change)