Add a few UI stuff and other random things