Number Format + UI design + big correction