Code cleanup in application selector. TODO: Application 'admin' needs to be excluded...