Some Cleanup and fixed extra scrollbars