Simple refactoring
Added animation and opacity