Modify display output slightly and fix the architecture override