Adapted some layout