Fixed Edges Rendering and added Scrollbars