Clear up some layout and resource ID confusion.