Fix buttons to calc app and reqmgr app