Use showmessage and small fix