Pretty up more stuff and made it match