#375 Use standard expanded view with x for persistent notifications

There isn't enough room to add a x to the small version, so still needs to show the reconstructed version.  For the expanded view use the standard notification layout, but show the x for closing the app.