Changing the ordering of segments
Merge branch 'master' of github.com:FikaProject/fika