Version 2.1, commit 20

Point entry pages updated