Acomplished TM's comments for the new layout