move out styles
Merge branch 'issue-125' into develop