Fixing element borders and spacing

Should address scrolling up/down