Some tweaking on scripts and styles