Changed layout and names