changed layout structure and style