Added scrollbars and error handling