Feature #43, improved layouts
Feature #43, updated README