Enhancement/xxx/ww bootstrap makeover