Fix Layout and PhotoActivity

Fix Layout and PhotoActivity