Navigation animation
Ui bug dirtyfix
Merge