app updates

- structure and minor tweaks