fixed messages and styling