adjust some layout issues