init
Merge https://github.com/zserre/twittermapp
more layout fixes