Small style changes
Added animation and more info
Merged from master