Fixed some errors, made styling more consistent