Try to make flow of overview nicer