added more default widgets for removal
fixed comments spacing