Update app setting for forwarding to device
Tweak view and fix bug