Improved layout + index + querying