twitter edit field now with leading '@'
merge
Mgerge remote-tracking branch 'upstream/master'
more layouting
Merge pull request #85 from leider/master

UI UI UI UI UI