Refactoring layout and code
Merge pull request #2 from kouphax/refactor

Refactoring layout and code