added code to fix layout and comments