Cleanup code
Review main page