updating commenting and layout