Some general GUI fixes
Add report calculation
Minor fixes