Enhanced styles & layout