CLSN-152 improve formula screen
if-else part added
Merge branch 'master' of https://github.com/algosystech/collosys