added layout, additions to base