Clean things up and make android version of one of the xibs.