Main page and uploader
Fix merge