style changes
changed name
js stuff