fixed messages and tabs