first draft of changed template layout