Make everything look a bit nicer! And lots of changes.