Improve top-edge layout

Still kind of hacky, but better than before.