Fixing scripting and style