Made it pretty and Fixed score