Based on user testing and living with my last design for a few months, I am revisiting my main/search page layout. I feel like the buttons take up too much space and are confusing to some users. This is the new direction I am taking, new Balsamiq Mockups coming up next.