Improve navbar image handling