changed layout and updated