Fixed message format, added button handling