Fix Comments, Add show hide