layouts in progress #22 big badges fix