Rework features boxes a bit