Tweak layouts and add new app name