fixed old layout issue