fix confict
Fix conflict part 4
fix confix 5
Merge pull request #18 from railsrumble/designfix

Designfix