finish first pass at proposal layout
start to add theme filtering