some layout bugs before 0.2
Merge pull request #3 from sqdavid/rel/0.2

some layout bugs before 0.2