Changes to add and select page