Layout makeover, work in progress