Fix stream height bug
Clean up frame layout