Improve thumb nail showing and improve upload menu