js and css code more organized now