Fix tabs
Add forgotten classes