updated layout, fadeOut, alligned code