Trimmed and fixed app click and item layout.
Moved to stg