Fixed overflow. Made spaces a little prettier