edit-button and some cleaning