Improve scores views

Added two new views and extracted scores using single queries