Merge member ui feature to master