fix some layout issues