Updates

Refactoring code, standardising gui. Working up to cert signing.