#1523 Move Photo and Audio into Seperate form section