fix config and layout glitches