Much cleaner, still need border-radius at least.