Big overhaul to lookup page