changed layout and fixed comments