Improve layout, fix warnings, and settle on initial list