More Settings work done