Revert "Revert "Apply Sam's UI changes to stock code""

This reverts commit 52545d5b198eeefae9c4e31627fb08490b072c21.