Some fixes to overview tab; general refactoring of computable data