add two buttons to top, fix newmasterkey button