Merge pull request #2 from bechi/temp

fix layout style
Revert "fix layout style"
Merge pull request #3 from maraoz/revert-2-temp

Revert "fix layout style"
fix with tony's feedback