Add clipping and adjust layout
update graph-coloring, update stream-buttons