Updated layout and killboard