layout, css, etc
Merge pull request #705 from luixxiul/development

layout, css, etc