Marginal UI improvements. Move to guardian GAE.