Re-design for cloud books
Gem changes
Merge remote-tracking branch 'rt/master'