Finished compare to an extent
restructuring and buttons
Merge remote-tracking branch 'origin/master'