App manager - UI review
Merge origin/rel/0.2 into rel/0.2