Improve views and navigation.