Close #32
clean up of unused pages and methods
Close #33
Close #17
pic fix try 1
Merge branch '3.0-scott'