Updated encryption and finished GUI