Make styling changes and fix bugs