Closes #134. Also added Ajax Modal Window