Thicker borders
Added in toolbars for view/edit mode
Added right for toolbar