Fixes #1 as well as capacity cal, project view and other reports bugs