Fix compiler warnings
Add back vertical scrollers