Merge pull request #11 from echen027/master

Made main table and fixed buttons on main page.