Add TOP and BOT markers, shuffle some things around