Fix some layouts and contents