Close a couple errors, add buttons to main page. Planing to refactoring