Re-organized main js some more and got both form add buttons functioning