Added scores tab + code clean up