Beta 70: RPG Layout & Some refactoring
Belongs to last commit