improve UI

Change-Id: I27ae2473de62e693bf955482ad4c01b919ba4dda
MoKeeHerlper: fix intent and code cleanup

Change-Id: I1228115cc27b7c793f5d9e4d01d83f3d9f8edf8b