Additional mutex + styling changes