Version 17

updated layout merged with Gabe's previous version