Cleaned up and fixed navigation animation