some layout bugs before 0.2

integrating down