ongoing tweaks
consistency in page interface
merged
Merge branch 'develop'