Fixed more things, improved more styles