More cleanup and added fade effect on image select