cleanup and more buttons and functionality
add color controls