Fix Scrollbar Issue

Fixed scrollbar issues as well as clean up some code