added a TON of changes in regards to css the javascript and a bunch of the php files
merge fix