change some layout. For kyle to keep working on this.