diff --git a/cmd/passgo-gui/main.go b/cmd/passgo-gui/main.go
index a23b6e4..36a2830 100644
--- a/cmd/passgo-gui/main.go
+++ b/cmd/passgo-gui/main.go
@@ -196,6 +196,7 @@ func eventLoop() {
 	w := app.NewWindow(
 		app.Size(unit.Dp(250), unit.Dp(500)),
 		app.Title("passgo"))
+	initPgp(w)
 	gtx := &layout.Context{Queue: w.Queue()}
 	//time.Sleep(time.Second/5)
 
@@ -388,7 +389,6 @@ func eventLoop() {
 				w.Invalidate()
 				page = idPage
 			default:
-				gtx.Constraints.Width.Min = gtx.Constraints.Width.Max
 				lst.Layout(gtx, len(passBtns), func(i int) {
 					btn := passBtns[i]
 					gtx.Constraints.Width.Min = gtx.Constraints.Width.Max
@@ -828,7 +828,6 @@ func eventLoop() {
 			case system.StageEvent:
 				if e.Stage == system.StageRunning {
 					go func() {
-						initPgp(w)
 						updateIdBtns()
 					}()
 				}
diff --git a/cmd/passgo-gui/ui.go b/cmd/passgo-gui/ui.go
index 25b25b7..964fd5f 100644
--- a/cmd/passgo-gui/ui.go
+++ b/cmd/passgo-gui/ui.go
@@ -41,7 +41,7 @@ func (b *Overlay) Layout(gtx *layout.Context) {
 			ins.Layout(gtx, func() {
 				l.Layout(gtx)
 			})
-			pointer.RectAreaOp{image.Rect(0, 0, gtx.Dimensions.Size.X, gtx.Dimensions.Size.Y)}.Add(gtx.Ops)
+			pointer.Rect(image.Rect(0, 0, gtx.Dimensions.Size.X, gtx.Dimensions.Size.Y)).Add(gtx.Ops)
 		})
 		c1 := st.Expand(gtx, func() {
 			layoutRRect(b.Background, gtx)
@@ -74,13 +74,15 @@ func layoutRRect(col color.RGBA, gtx *layout.Context) {
 			f32.Point{0, 0},
 			f32.Point{w, h},
 		}
-	clip.RoundRect(gtx.Ops, rect, r, r, r, r)
+	//clip.RoundRect(gtx.Ops, rect, r, r, r, r)
+	clip.Rect{Rect: rect, NE: r, NW: r, SE: r, SW: r}.Op(gtx.Ops).Add(gtx.Ops)
 	paint.ColorOp{Color: col}.Add(gtx.Ops)
 	paint.PaintOp{Rect: f32.Rectangle{Max: f32.Point{X: w, Y: h}}}.Add(gtx.Ops)
 	gtx.Dimensions = layout.Dimensions{Size: sz}
 }
 
 func (b *Button) Layout(gtx *layout.Context) {
+	mwidth := gtx.Constraints.Width.Min
 	b.clicked = false
 	for _, ev := range b.Click.Events(gtx) {
 		if ev.Type == gesture.TypeClick {
@@ -97,10 +99,11 @@ func (b *Button) Layout(gtx *layout.Context) {
 			ins.Layout(gtx, func() {
 				l.Layout(gtx)
 			})
-			pointer.RectAreaOp{image.Rect(0, 0, gtx.Dimensions.Size.X, gtx.Dimensions.Size.Y)}.Add(gtx.Ops)
+			pointer.Rect(image.Rect(0, 0, gtx.Dimensions.Size.X, gtx.Dimensions.Size.Y)).Add(gtx.Ops)
 			b.Click.Add(gtx.Ops)
 		})
 		c1 := st.Expand(gtx, func() {
+			gtx.Constraints.Width.Min = mwidth
 			layoutRRect(b.Background, gtx)
 		})
 		st.Layout(gtx, c1, c2)
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..754562d
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,13 @@
+module git.wow.st/gmp/passgo
+
+go 1.13
+
+require (
+	gioui.org v0.0.0-20191126175243-2ca2e5462f16
+	git.wow.st/gmp/clip v0.0.0-20191001134149-1458ba6a7cf5
+	git.wow.st/gmp/rand v0.0.0-20191001220155-a81bebfaf8b0
+	github.com/fsnotify/fsnotify v1.4.7
+	github.com/jcmdev0/gpgagent v0.0.0-20180509014935-5601b32d936c
+	golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c
+	gopkg.in/yaml.v2 v2.2.7
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..76854e2
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,40 @@
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+gioui.org v0.0.0-20191126175243-2ca2e5462f16 h1:p31rtmKm51xpj2QtqGNlljAyHEP1oStU8MDRl2Dv7Gs=
+gioui.org v0.0.0-20191126175243-2ca2e5462f16/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY=
+git.wow.st/gmp/clip v0.0.0-20191001134149-1458ba6a7cf5 h1:OKeTjZST+/TKvtdA258NXJH+/gIx/xwyZxKrAezNFvk=
+git.wow.st/gmp/clip v0.0.0-20191001134149-1458ba6a7cf5/go.mod h1:NLdpaBoMQNFqncwP8OVRNWUDw1Kt9XWm3snfT7cXu24=
+git.wow.st/gmp/rand v0.0.0-20191001220155-a81bebfaf8b0 h1:08wP00wvbDINsct1fzKV1xGGLvvtNsSb2X4CtIdpBzM=
+git.wow.st/gmp/rand v0.0.0-20191001220155-a81bebfaf8b0/go.mod h1:8+2Gwnrpc5yuk8Wp6cBhxvGcNLumYiPbQ7n0SQ8h29A=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/jcmdev0/gpgagent v0.0.0-20180509014935-5601b32d936c h1:DCnjNrPDSEslcqqBgcZBxlLUIhk2elQVyf2V+HkyxJI=
+github.com/jcmdev0/gpgagent v0.0.0-20180509014935-5601b32d936c/go.mod h1:vdJ2op9pzpbH8CbpYKYBD6zjURqDY13PmnVn2I/uYBs=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c h1:/nJuwDLoL/zrqY6gf57vxC+Pi+pZ8bfhpPkicO5H7W4=
+golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3 h1:n9HxLrNxWWtEb1cA950nuEEj3QnKbtsCJ6KjcgisNUs=
+golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/impl_android.go b/impl_android.go
index ae65233..cf8a8b8 100644
--- a/impl_android.go
+++ b/impl_android.go
@@ -49,10 +49,7 @@ func Java_st_wow_git_passgo_PgpConnect_installComplete(env *C.JNIEnv, class C.jc
 
 func InitPgp(w *app.Window) {
 	log.Printf("InitPgp()")
-	err := w.RegisterFragment("st/wow/git/passgo/PgpConnect")
-	if err != nil {
-		log.Printf("Error! %s", err)
-	}
+	w.RegisterFragment("st/wow/git/passgo/PgpConnect")
 }
 
 func stopPgp() {