Fix addMessage and improve index view