Added animation and updated layout