quick partial fix for layout issues