Readded the Master button and related functions.