Simplified database and added results page