Modifying view, adding scores, fixing few bugs