Updated everything to look a might prettier.
Further Pretty!