Adding missing dependencies
Cleaning up styles