Removed form from main page and added table to main/map page