Re-ordered some elements to stop gradle complaining and removed an erroneous "@+id"