fixed size of photos on plan page
merge conflicts