Added open pdf ability
Fixed conflicts