Remove some extra padding and fix some borders