UI size and margin changes; code clean-up; clarified versioning