Refactor to get rid of layout warnings from unused/incorrect @+id