FIX: Centralize Top rendering, remove old code paths. Fix some bugs.