Fixed issues with embeded comments and added styling

@ahume please review