added an add button and tweaked more things