fixing a few layout bugs