Refactoring code, modularizing html
Adding passphrase support
Minor changes