#884 Fix scrollbars and #896 403/