Changed some stuff attempting to get rid of some transition
animations... not really sure what but it all works the same as before.