Integrated works done by Jinsoo & Sujin

Note: Used text link instead of input button due to php echo issue