Added animation, fixed extra space on right