Updated and condensed js and styles