fixing some layout issues