Added photo capabilities and fixed layout