Adding application state 'sashes'

And a couple of minor fixes that snuck in along the way