Made current threshold +/- more clear, reduced margin on setup layout, versioning