fixing some layout problems