Minor logic and styling changes