Moved comments into Partial view, minor updates