Some buttons and some refactor added
Added function to delete messages, need to check