Improve layout and authors