Bug fix General style and layout
Merge pull request #361 from panseo/test

Bug fix General style and layout