Slight organization and optimization of overview view