fix for some layout issues