changed some layout