Final build with drop down and settings number format fix