Cleaned up app and added filtering and routes