Fixed calculation error and enabled display for other status than active
Fixed calcuation and switched back to Franks version of permissioning