Merge "Fine tune App Info and App Buttons"