fix spacing and remove views since they aren't used