Simplified the choices in layout.xml