Little changes to layouts and comments