[FEATURE] Slightly reorganize markup in show view