Refinments in layout, JS and package.json