Fixed main layout + Fixed uploading file