Many UI improvements + proto updates