Fixed comments layoust