Fixed bug and layout for list
Merge branch 'Version1.0' of https://github.com/Fukuyoshi/BoomProject into Version1.0