Made a few small changes. Some placeholder JS too