Feature/226/update feature style



<!---
@huboard:{"order":57.8125,"milestone_order":233,"custom_state":"ready"}
-->