Added comments controls and styles