Added a few packages, remove scrollbars, refactored a little.