merged all the new stuff
updated styles