fixing some layout