Fixed GUI and added Click implementation for password