added buttons with labels and/or icons, and finished photo activity