Big style issues fixed