Added list of messages/notifications and some fixes + cleanup