Feature #43, refactored layouts