Added master user check for tip area, cleaned up stuff