Overhaul layout, change fields