Updated styles & layouts