Many UI refinments
Added Master Button