fixed spacing and display bugs