add an add button and some cleanup