Added no gutter layout to drivers
Cleaned up the includes