Changing Lay-Out and comments