added uapd save support
some layout tweaks