First draft of query view components