More form functionality

Fixed Pinpoint/cite to change