bugfix #DE4 and Fix styles