Made alot of style changes