Visual consistency fixes