UI improved and double decimal digit formatted