did everything from todo except for text change of buttons in criteria view