Reorganize a little bit, add fadeIn effect