some fixes related to layouts and documentation