Continued clean up, basic java script functionality added for button