changes for citizen desk (don't merge)

close #277 

just to discuss what to do with this. maybe we can cherry pick something (like this settings mv) @amagdas