features view updated + common style view created
dev -> master merged