Fix bottle amount scaling and cleanup report and chart views a little.