fixed master copy

added header fix, tables cleanup, and button changes