[Editable] second visual fixes