Merge pull request #430 from shutter111/development

Updated Build and Price UI
F56 Build and Price. Updated items, titles, conflict logic