styling changes and bug fixes