updated layout and comments