Made many changes, added show hide js