Improved doc layout