changes margins and other stuff then fixes