improve layout, clean up code, update apk to latest version