Fix issue with inline script & small style fix