Quote form added + slight restructuring