Made Edit message code better, added code for move up/down buttons