Integrated page selector with the latest changes on development branch