Changed classes to better fit wiki