extended functional spec coverage
refactored layouts