correct scripts and make it look beter