Added modal functionality .. Finally :)