Major Bug Fixes

Signed-off-by: Orangescrum <developer@orangescrum.com>
Fixes

Signed-off-by: Orangescrum <developer@orangescrum.com>
Fixes

Signed-off-by: Orangescrum <developer@orangescrum.com>