added spacing and tons of good layout