minor tidying
added icons
fixed icons
Fixed an issue keeping track of the current interface in the app state singleton.