Scrollbars added, some minor bugs fixed and made :)