Enhanced apps management [WIP]

:construction: